d/p: Update remaining patches

diff --git a/debian/patches/08_remove_system_processor.patch b/debian/patches/08_remove_system_processor.patch
index 6f183e4140e64525f6b673accc977bddf92668a7..73978d810aee0f77a00db1af7e1ac9bf55256cc8 100644 (file)
--- a/debian/patches/08_remove_system_processor.patch
+++ b/debian/patches/08_remove_system_processor.patch
@@ -2,3 +2,21 @@ Description: Remove the systemprocessor name in the compilate
  Required for reproducible builds, and it is also not reliable 
 Author: Gert Wollny <gw.fossdev@gmail.com>
 
+--- a/CMake/dcmtkPrepare.cmake
++++ b/CMake/dcmtkPrepare.cmake
+@@ -373,15 +373,6 @@
+     set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -D_XOPEN_SOURCE_EXTENDED -D_XOPEN_SOURCE=500 -D_BSD_SOURCE -D_DEFAULT_SOURCE -D_BSD_COMPAT -D_OSF_SOURCE -D_POSIX_C_SOURCE=199506L")
+   endif()
+ 
+-  option(DCMTK_FORCE_FPIC_ON_UNIX "Add -fPIC compiler flag on unix 64 bit machines to allow linking from dynamic libraries even if DCMTK is built statically" OFF)
+-  mark_as_advanced(DCMTK_FORCE_FPIC_ON_UNIX)
+-
+-  # Setting for IA64 / x86_64 which needs -fPIC compiler flag required for shared library build on these platforms
+-  if(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64" AND UNIX AND DCMTK_FORCE_FPIC_ON_UNIX)
+-    set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -fPIC")
+-    set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} -fPIC")
+-  endif()
+-
+ endif()
+ 
+ # define libraries and object files that must be linked to most Windows applications

diff --git a/debian/patches/series b/debian/patches/series
index f13541ae091b5ff4425c1f443ab2757faf60c557..4660d5ee1e58b928ef87481cc66a19c05cb99ed7 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -5,5 +5,3 @@
 05_performance.patch
 07_dont_export_all_executables.patch
 08_remove_system_processor.patch
-09_fix_format_on_32bit.patch
-10_correct_format_output_size.patch